From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Wed, 11 May 2011 21:43:25 +0000 (-0400)
Subject: workspace: End zooming when starting a window drag
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8262
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6e6b1e6052b762279b4a8fbaee78f3bb2d690332;p=gnome-shell.git

workspace: End zooming when starting a window drag

The mouse-wheel zooming "easter egg" breaks horribly when you
drag a window, due to ugly lightbox reparenting tricks it uses.

For now, just end any zoom before we drag the window around.

https://bugzilla.gnome.org/show_bug.cgi?id=649632
---

diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index c06720db2..bcffa5c55 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -296,6 +296,9 @@ WindowClone.prototype = {
     },
 
     _onDragBegin : function (draggable, time) {
+        if (this._zooming)
+            this._zoomEnd();
+
         [this.dragOrigX, this.dragOrigY] = this.actor.get_position();
         this.dragOrigScale = this.actor.scale_x;
         this.inDrag = true;